Add telepathy-glib as a dependency

We'll be refactoring the Telepathy client to use telepathy-glib, so we need to
build it.

diff --git a/configure.ac b/configure.ac
index 20e4347a6b7b3fbbfba3c3f36b23dab51f43157f..92976cc23e5dfbf465467c7dd461df110ed09fc1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,7 @@ LIBECAL_REQUIRED=1.6.0
 LIBEDATASERVER_REQUIRED=1.2.0
 LIBEDATASERVERUI2_REQUIRED=1.2.0
 LIBEDATASERVERUI3_REQUIRED=2.91.6
+TELEPATHY_GLIB_MIN_VERSION=0.13.12
 
 
 # Collect more than 20 libraries for a prize!
@@ -84,7 +85,8 @@ PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION
                                 clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
                                  libstartup-notification-1.0
                                  gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
-                                libcanberra)
+                                libcanberra
+                                 telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION)
 
 GJS_VERSION=`$PKG_CONFIG --modversion gjs-internals-1.0`
 AC_DEFINE_UNQUOTED([GJS_VERSION], ["$GJS_VERSION"], [The version of GJS we're linking to])

diff --git a/src/Makefile.am b/src/Makefile.am
index 9c6934441bf2bb098208be914ddf6ca91d6b8dc8..33d97e5c16785e578164484e31606e3cdd6ec5f2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -232,6 +232,7 @@ Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) St-1.0.gir libgnome-shell.la Makefile
                --include=Clutter-1.0                   \
                --include=ClutterX11-1.0                \
                --include=Meta-2.91                     \
+               --include=TelepathyGLib-0.12            \
                --libtool="$(LIBTOOL)"                  \
                --add-include-path=$(builddir)          \
                --include=St-1.0                        \

diff --git a/tools/build/gnome-shell.modules b/tools/build/gnome-shell.modules
index 91803d6fd9ed73e3343529ee577e099fff847a55..23385f63ea611ad0a0b993fa6f5cf3ca58a588f3 100644 (file)
--- a/tools/build/gnome-shell.modules
+++ b/tools/build/gnome-shell.modules
@@ -16,6 +16,8 @@
   <repository type="cvs" name="libxklavier.freedesktop.org"
       cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/xklavier"
       password=""/>
+  <repository type="git" name="git.collabora.co.uk"
+      href="git://git.collabora.co.uk/git/"/>
 
   <autotools id="gobject-introspection">
     <branch repo="git.gnome.org" module="gobject-introspection"/>
@@ -211,6 +213,13 @@
     </dependencies>
   </autotools>
 
+  <autotools id="telepathy-glib">
+    <branch repo="git.collabora.co.uk" module="telepathy-glib"/>
+    <dependencies>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-shell">
     <branch repo="git.gnome.org" module="gnome-shell"/>
     <dependencies>
@@ -227,6 +236,7 @@
         <dep package="libcanberra"/>
        <dep package="gnome-settings-daemon"/>
        <dep package="gnome-bluetooth"/>
+        <dep package="telepathy-glib"/>
     </dependencies>
   </autotools>